Add support for JUnit6 by schulzjo-tng · Pull Request #1659 · TNG/ArchUnit

schulzjo-tng · 2026-07-09T12:41:02Z

Check if [part2]add support JUnit 6.x testing framework. #1658 covers anything not covered here
Consider cleaning up commit history
Add documentation

arukiidou · 2026-07-09T13:16:26Z

Part 1 and Part 2 are almost identical.
If possible, I　recommend cherry-picking from Part 2.

Only the following three things should be different:

It starts over again from the addition of the shared tests
The commits have been split into smaller ones to make things easier
example-test has been added

schulzjo-tng · 2026-07-10T14:02:07Z

+    Stream<T> FrozenRulesTest(Class<?> frozenRulesTestClass) {
+        return frozenRulesExpectedTestFailures(frozenRulesTestClass).toDynamicTests();
+    }


no aroundTestInvoke is needed for JUnit6 - it was only needed on Java 8 and 11, which JUnit6 doesn't support

schulzjo-tng · 2026-07-10T14:04:43Z

-def addCleanThirdPartyTask = {
-    // These files are already relocated into archunit.jar, so they're transitively available
-    tasks.create(name: 'removeDuplicateThirdParty', type: Jar, dependsOn: shadowJar) {
-        exclude "${thirdPartyRelocationPackage.replace('.', '/')}/**"
-
-        File tempPath = tempJar(jar.archiveFile.get().getAsFile())
-        File jarPath = shadowJar.archiveFile.get().getAsFile()
-        inputs.file(jarPath)
-        from zipTree(jarPath)
-        archiveFileName = tempPath.name
-
-        doLast {
-            assert jarPath.delete()
-            assert tempPath.renameTo(jarPath)
-        }
-    }
-    finishArchive.dependsOn removeDuplicateThirdParty
-}


This task caused build failures on Windows. After some investigation, I concluded that it is no longer needed - the existing dependencies.exclude() make this transformation an identity operation. Also, there is test coverage for missing exclude statements (see :checkArtifact), so we can't accidentally publish a release where the problem that this code meant to address is present.

schulzjo-tng · 2026-07-10T14:05:23Z

            Set<SingleTest> result = new HashSet<>();
            for (int i = 0; i < classNames.size(); i++) {
-                result.add(new SingleTest(classNames.get(i), testNames.get(i)));
+                result.add(new SingleTest(toSimpleClassName(classNames.get(i)), testNames.get(i)));


This was needed due to a change in the test reports (major version upgrade)

Which should be isolated in a separate commit, as it's entirely unrelated to Add JUnit6 test coverage. 😉

→ 2c2fcce

Fair enough. It is a necessary prerequisite since the old version of Surefire didn't work with JUnit 6.

schulzjo-tng · 2026-07-10T14:05:54Z

+        [prepareMavenTest, executeRules, verifyRules, cleanUpMavenTest, runMavenTest].each { taskName ->
+            tasks[taskName].onlyIf("requires Java ${config.minimumJavaVersion} or higher") {
+                config.supports(integrationTestJavaVersion)
+            }
+        }


We cannot run the JUnit6 tasks on Java 8 and 11, hence this new block

schulzjo-tng · 2026-07-10T14:06:23Z

+                        .replace('#{mavenSurefirePluginVersion}', "${mavenSurefirePlugin.version}")
+                        .replace('#{mavenCompilerPluginVersion}', "${mavenCompilerPlugin.version}")


This way, the plugins are updated via dependabot

schulzjo-tng · 2026-07-10T14:07:00Z

-        surefireExampleConfiguration: '<groups>example</groups>',
-        archunitTestArtifact: 'archunit-junit5',
-        additionalDependencies: """
+def testConfigFor = (TestType testType) -> {


This restructure makes it harder to forget adding a case for a new JUnit version

schulzjo-tng · 2026-07-10T14:08:36Z

-    public static class ArchUnitProductionCode implements ImportOption {
-        private static final Set<String> SOURCE_ROOTS = sourceRootsOf(
-                ArchConfiguration.class,
-                ArchUnitRunner.class,
-                ArchTag.class,
-                FieldSelector.class,
-                ArchUnitTestEngine.class);
-
-        private static Set<String> sourceRootsOf(Class<?>... classes) {
-            ImmutableSet.Builder<String> result = ImmutableSet.builder();
-            for (Class<?> c : classes) {
-                String classFile = "/" + c.getName().replace('.', '/') + ".class";
-                String file = c.getResource(classFile).getFile();
-                result.add(file.substring(0, file.indexOf(classFile)));
-            }
-            return result.build();
-        }
-
-        @Override
-        public boolean includes(Location location) {
-            boolean include = false;
-            for (String sourceRoot : SOURCE_ROOTS) {
-                if (location.contains(sourceRoot)) {
-                    include = true;
-                }
-            }
-            return include && DO_NOT_INCLUDE_TESTS.includes(location);
-        }
-    }


We now decide on a subproject basis if something is "production code"

schulzjo-tng · 2026-07-10T14:09:24Z

moved to archunit-self-test/src/main/java/com/tngtech/archunit/ArchUnitExampleArchitectureRules.java with too many changes

schulzjo-tng · 2026-07-10T14:10:14Z

-    implementation project(path: ':archunit')
-    implementation project(path: ':archunit-junit4')
-    implementation project(path: ':archunit-junit5')
-    implementation project(path: ':archunit-junit5-engine')
-    implementation project(path: ':archunit-example:example-plain')
-    implementation project(path: ':archunit-example:example-plain', configuration: 'tests')
-    implementation project(path: ':archunit-example:example-junit4', configuration: 'tests')
-    implementation project(path: ':archunit-example:example-junit5', configuration: 'tests')
-
-    testImplementation project(path: ':archunit-junit5')


The self-tests are now imported by those packages. This was necessary because classes between archunit-junit5 and archunit-junit6 would collide, and only one of them would get tested

schulzjo-tng · 2026-07-10T14:12:05Z

@@ -0,0 +1,29 @@
+sourceSets {
+    archTest {


We use a separate source set because the self-tests need a specific archunit-junit* version, which would otherwise pollute the test classpath or interfere with other tests

Issue: #1556 Signed-off-by: junya koyama <arukiidou@yahoo.co.jp>

Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

- Required because the previous setting was unable to test junit5-engine and junit6-engine at the same time Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

This task caused build failures on Windows. After some investigation, I concluded that it is no longer needed - the existing `dependencies.exclude()` make this transformation an identity operation. Also, there is test coverage for missing `exclude` statements (see `:checkArtifact`), so we can't accidentally publish a release where the problem that this code meant to address is present. Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

schulzjo-tng · 2026-07-10T14:33:35Z

@@ -20,13 +20,12 @@ task ensureReleaseCheckUpToDate {
            VersionCatalog versionCatalog = versionCatalogs.named("libs")
            def dependencies = versionCatalog.libraryAliases.collect { versionCatalog.findLibrary(it).get().get() }
            def matchingProjectDependency = dependencies.find {


The old logic no longer worked on dependencies to junit-platform-launcher which would get mixed up

Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

hankem · 2026-07-10T15:57:28Z

+def junit5VintageEngine = libs.junit5VintageEngine.get()
+def junit6VintageEngine = libs.junit6VintageEngine.get()


Those could be moved to the case TestType.JUNIT5 / JUNIT6 blocks.

→ 01f4f01

hankem · 2026-07-10T15:58:04Z

            Set<SingleTest> result = new HashSet<>();
            for (int i = 0; i < classNames.size(); i++) {
-                result.add(new SingleTest(classNames.get(i), testNames.get(i)));
+                result.add(new SingleTest(toSimpleClassName(classNames.get(i)), testNames.get(i)));


Which should be isolated in a separate commit, as it's entirely unrelated to Add JUnit6 test coverage. 😉

hankem · 2026-07-10T16:01:41Z

+    testImplementation project(path: ':archunit-example:example-junit6', configuration: 'tests')
+
+    testRuntimeOnly project(path: ':archunit-junit6-engine')
+    // TODO still up-to-date?


… be allow-listed Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

schulzjo-tng force-pushed the feature/junit6-with-test-coverage branch 2 times, most recently from 25a25d8 to c9660f2 Compare July 9, 2026 14:33

This was referenced Jul 10, 2026

Update Maven examples (and Gradle wrapper) #1450

Open

[part2]add support JUnit 6.x testing framework. #1658

Closed

schulzjo-tng force-pushed the feature/junit6-with-test-coverage branch 2 times, most recently from 9998433 to dabea23 Compare July 10, 2026 13:57

schulzjo-tng commented Jul 10, 2026

View reviewed changes

arukiidou and others added 5 commits July 10, 2026 16:32

add support JUnit 6.x testing framework initial commit.

27cd4f1

Issue: #1556 Signed-off-by: junya koyama <arukiidou@yahoo.co.jp>

Fix build errors

0b33de2

Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

Add JUnit6 test coverage

a6323d0

Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

Restructure self-tests

1bc10ea

- Required because the previous setting was unable to test junit5-engine and junit6-engine at the same time Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

schulzjo-tng force-pushed the feature/junit6-with-test-coverage branch from dabea23 to 75512aa Compare July 10, 2026 14:32

schulzjo-tng commented Jul 10, 2026

View reviewed changes

This was referenced Jul 13, 2026

Bump junit5 from 5.14.4 to 6.1.2 #1664

Closed

Bump junit5 from 5.14.4 to 6.1.1 #1649

Closed

Bump junit5 from 5.14.4 to 6.1.0 #1624

Closed

Bump junit5 from 5.14.4 to 6.0.3 #1621

Closed

Bump junit5 from 5.14.1 to 6.0.2 #1575

Closed

Update Documentation

5c39e09

Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

hankem reviewed Jul 13, 2026

View reviewed changes

Cleanup: junit4 did not depend on junit5 packages, so they should not…

be47bea

… be allow-listed Signed-off-by: Dr. Jonathan Schulz <jonathan.schulz@tngtech.com>

		.replace('#{mavenSurefirePluginVersion}', "${mavenSurefirePlugin.version}")
		.replace('#{mavenCompilerPluginVersion}', "${mavenCompilerPlugin.version}")

		def junit5VintageEngine = libs.junit5VintageEngine.get()
		def junit6VintageEngine = libs.junit6VintageEngine.get()

Uh oh!

Conversation

schulzjo-tng commented Jul 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

arukiidou commented Jul 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

schulzjo-tng commented Jul 9, 2026 •

edited

Loading

arukiidou commented Jul 9, 2026 •

edited

Loading